From: David Reitter <david.reitter@gmail.com>
Date: Fri, 25 Sep 2009 17:40:53 +0000 (+0000)
Subject: nsmenu.m (EmacsMenu-clear): Recognize application menu
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~10301
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=dbac49ed8a843a36d19750cc55018ffeb239a360;p=emacs.git

nsmenu.m (EmacsMenu-clear): Recognize application menu
	on Mac OS X 10.6+ (bug#4513).
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 12b9db40e2b..ec6b630222c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-25  David Reitter  <david.reitter@gmail.com>
+
+	* nsmenu.m (EmacsMenu-clear): Recognize application menu
+	on Mac OS X 10.6+ (bug#4513).
+
 2009-09-24  Juanma Barranquero  <lekktu@gmail.com>
 
 	* frame.c (xrdb_get_resource): Return nil for empty string resources;
diff --git a/src/nsmenu.m b/src/nsmenu.m
index 79644d28a80..749a1d0fe76 100644
--- a/src/nsmenu.m
+++ b/src/nsmenu.m
@@ -668,7 +668,7 @@ name_is_separator (name)
 
 
 /* convenience */
--(void) clear
+-(void)clear
 {
   int n;
   
@@ -676,7 +676,9 @@ name_is_separator (name)
     {
       NSMenuItem *item = [self itemAtIndex: n];
       NSString *title = [item title];
-      if (([title length] == 0 || [@"Apple" isEqualToString: title])
+      if (([title length] == 0  /* OSX 10.5 */
+	   || [@"Emacs" isEqualToString: title]  /* from 10.6 on */
+	   || [@"Apple" isEqualToString: title]) /* older */
           && ![item isSeparatorItem])
         continue;
       [self removeItemAtIndex: n];